211. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:06 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

211.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Contact/templatescontact_page.phtml2017-12-05 00:30:32 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Contact/templatescontact_page.phtml2017-12-05 00:30:32 +0000

211.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged144
Changed00
Inserted00
Removed00

211.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

211.4 Active regular expressions

No regular expressions were active.

211.5 Comparison detail

1 <?php 1 <?php
2     $contacts_config = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/contacts'); 2     $contacts_config = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/contacts');
3     $_infoblock = $contacts_config['infoblock']; 3     $_infoblock = $contacts_config['infoblock'];
4     $_customblock = $contacts_config['customblock']; 4     $_customblock = $contacts_config['customblock'];
5      5     
6     if($_customblock) { 6     if($_customblock) {
7         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block'); 7         $block = $this->getLayout()->createBlock('Magento\Cms\Block\Block');
8         if($block) { 8         if($block) {
9             $block->setBlockId($_customblock); 9             $block->setBlockId($_customblock);
10         } 10         }
11         if($block){ 11         if($block){
12             echo '<div class="row"><div class="col-md-12">'.$block->toHtml().'</div></div>'; 12             echo '<div class="row"><div class="col-md-12">'.$block->toHtml().'</div></div>';
13         } 13         }
14     } 14     }
15 ?> 15 ?>
16 <div class="row"> 16 <div class="row">
17     <div class="col-md-8"><?php echo $this->getChildHtml('contactForm')?></div> 17     <div class="col-md-8"><?php echo $this->getChildHtml('contactForm')?></div>
18     <div class="col-md-4 contact-info"> 18     <div class="col-md-4 contact-info">
19         <div class="contacts-title"><?php echo __('Contact') ?> <b><?php echo __('Details') ?></b></div> 19         <div class="contacts-title"><?php echo __('Contact') ?> <b><?php echo __('Details') ?></b></div>
20         <?php echo $_infoblock; ?> 20         <?php echo $_infoblock; ?>
21     </div> 21     </div>
22 </div> 22 </div>